Auto merge of #3782 - alexcrichton:more-proc-macro, r=matklad
authorbors <bors@rust-lang.org>
Fri, 3 Mar 2017 08:05:43 +0000 (08:05 +0000)
committerbors <bors@rust-lang.org>
Fri, 3 Mar 2017 08:05:43 +0000 (08:05 +0000)
Accept proc_macro in addition to proc-macro

More historical behavior...


Trivial merge